From 16fabf71a4eac5202d8f10e795669cdad9fb11f8 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Wed, 18 May 2022 19:36:02 +0100
Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS

Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff
---
 config_host.mk.in       |   1 +
 configure.ac            | Bin 527651 -> 527791 bytes
 solenv/gbuild/gbuild.mk |   2 ++
 3 files changed, 3 insertions(+)

diff --git a/config_host.mk.in b/config_host.mk.in
index d59518d2101..54798e0836a 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -94,6 +94,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
 export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
 export CPUNAME=@CPUNAME@
 export CDEFAULTOPT=@CDEFAULTOPT@
+export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@
 export CROSS_COMPILING=@CROSS_COMPILING@
 export CUCKOO_CFLAGS=$(gb_SPACE)@CUCKOO_CFLAGS@
 export CURL=@CURL@
diff --git a/configure.ac b/configure.ac
index d29a92bba2313f4f09b66b5c591c48e7aecc8fd9..043cb18c668ae3bbd932711a41b4694786f471f1 100644
GIT binary patch
delta 178
zcmZ2HOJV(Ng@zW!7N!>F7M2#)Eo{e2>NC?6N>YnU6m%;T^h=A2^pi64^ivA5({+<d
zGjmeXauU;vtrbc#QuDYJAi%>h$i>w!-Z>z^&BxI_*fs%8wSum0dTNOROkTmrPCq5J
wOh2zQCntd`EtAX9IX*blDL6y}Y!ENPBuy@^=@ZJ?B-<a9ux)=(!tOi+0J}{(3;+NC

delta 31
ncmZ2KTVe4mg@zW!7N!>F7M2#)Eo{e2+Jj5kwg;E8$IJi#zaR^*

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 6d074400748..cbe96ece027 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -260,6 +260,8 @@ gb_GLOBALDEFS += \
 		DISABLE_DYNLOADING \
 	)
 
+gb_GLOBALDEFS += $(HARDEN_CPPFLAGS)
+
 gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
 
 # Common environment variables passed into all gb_*Test classes:
-- 
2.30.2